From 60cd679ba2c1d9045127fc15b0be20d86b939af6 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 19 Jan 2007 18:04:00 +0000 Subject: [PATCH] [XEN] Move hvm get/set domctl() commands to arch/x86/domctl.c. Signed-off-by: Keir Fraser --- xen/arch/x86/domctl.c | 73 +++++++++++++++++++++++++++++++++++++++++++ xen/common/domctl.c | 73 ------------------------------------------- 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index fdc102c1a5..0d8c0b4671 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -293,6 +293,79 @@ _long arch_do_domctl( } break; + case XEN_DOMCTL_sethvmcontext: + { + struct hvm_domain_context *c; + struct domain *d; + struct vcpu *v; + + ret = -ESRCH; + if ( (d = find_domain_by_id(domctl->domain)) == NULL ) + break; + + ret = -ENOMEM; + if ( (c = xmalloc(struct hvm_domain_context)) == NULL ) + goto sethvmcontext_out; + + v = d->vcpu[0]; + + ret = -EFAULT; + +#ifndef CONFIG_COMPAT + if ( copy_from_guest(c, domctl->u.hvmcontext.ctxt, 1) != 0 ) + goto sethvmcontext_out; + + ret = arch_sethvm_ctxt(v, c); +#endif + + xfree(c); + + sethvmcontext_out: + put_domain(d); + + } + break; + + case XEN_DOMCTL_gethvmcontext: + { + struct hvm_domain_context *c; + struct domain *d; + struct vcpu *v; + + ret = -ESRCH; + if ( (d = find_domain_by_id(domctl->domain)) == NULL ) + break; + + ret = -ENOMEM; + if ( (c = xmalloc(struct hvm_domain_context)) == NULL ) + goto gethvmcontext_out; + + v = d->vcpu[0]; + + ret = -ENODATA; + if ( !test_bit(_VCPUF_initialised, &v->vcpu_flags) ) + goto gethvmcontext_out; + + ret = 0; + if (arch_gethvm_ctxt(v, c) == -1) + ret = -EFAULT; + +#ifndef CONFIG_COMPAT + if ( copy_to_guest(domctl->u.hvmcontext.ctxt, c, 1) ) + ret = -EFAULT; + + xfree(c); +#endif + + if ( copy_to_guest(u_domctl, domctl, 1) ) + ret = -EFAULT; + + gethvmcontext_out: + put_domain(d); + + } + break; + default: ret = -ENOSYS; break; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index a374b1ca32..3c0e1cd7bc 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -218,39 +218,6 @@ ret_t do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) } break; - case XEN_DOMCTL_sethvmcontext: - { - struct hvm_domain_context *c; - struct domain *d; - struct vcpu *v; - - ret = -ESRCH; - if ( (d = find_domain_by_id(op->domain)) == NULL ) - break; - - ret = -ENOMEM; - if ( (c = xmalloc(struct hvm_domain_context)) == NULL ) - goto sethvmcontext_out; - - v = d->vcpu[0]; - - ret = -EFAULT; - -#ifndef CONFIG_COMPAT - if ( copy_from_guest(c, op->u.hvmcontext.ctxt, 1) != 0 ) - goto sethvmcontext_out; - - ret = arch_sethvm_ctxt(v, c); -#endif - - xfree(c); - - sethvmcontext_out: - put_domain(d); - - } - break; - case XEN_DOMCTL_pausedomain: { struct domain *d = find_domain_by_id(op->domain); @@ -605,46 +572,6 @@ ret_t do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) } break; - case XEN_DOMCTL_gethvmcontext: - { - struct hvm_domain_context *c; - struct domain *d; - struct vcpu *v; - - ret = -ESRCH; - if ( (d = find_domain_by_id(op->domain)) == NULL ) - break; - - ret = -ENOMEM; - if ( (c = xmalloc(struct hvm_domain_context)) == NULL ) - goto gethvmcontext_out; - - v = d->vcpu[0]; - - ret = -ENODATA; - if ( !test_bit(_VCPUF_initialised, &v->vcpu_flags) ) - goto gethvmcontext_out; - - ret = 0; - if (arch_gethvm_ctxt(v, c) == -1) - ret = -EFAULT; - -#ifndef CONFIG_COMPAT - if ( copy_to_guest(op->u.hvmcontext.ctxt, c, 1) ) - ret = -EFAULT; - - xfree(c); -#endif - - if ( copy_to_guest(u_domctl, op, 1) ) - ret = -EFAULT; - - gethvmcontext_out: - put_domain(d); - - } - break; - case XEN_DOMCTL_getvcpuinfo: { struct domain *d; -- 2.30.2